From: Mieczyslaw Nalewaj Date: Sun, 1 Jun 2025 06:49:28 +0000 (+0200) Subject: kernel: remove duplicate PREEMPT settings X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22%24PHP_SELF/%22https:/collectd.org/%22%24PHP_SELF?a=commitdiff_plain;h=b44f85f51cbe63d1994917d543d998fccf826dce;p=openwrt%2Fopenwrt.git kernel: remove duplicate PREEMPT settings Remove duplicate PREEMPT settings PREEMPT_NONE_BUILD and PREEMPT_RT which are already in target/linux/generic/config-6.12. Signed-off-by: Mieczyslaw Nalewaj Link: https://github.com/openwrt/openwrt/pull/18986 Signed-off-by: Hauke Mehrtens --- diff --git a/target/linux/d1/config-6.12 b/target/linux/d1/config-6.12 index 9a49062a3e..5d2b2e58fe 100644 --- a/target/linux/d1/config-6.12 +++ b/target/linux/d1/config-6.12 @@ -297,7 +297,6 @@ CONFIG_POWER_RESET_SYSCON=y CONFIG_POWER_RESET_SYSCON_POWEROFF=y CONFIG_POWER_SUPPLY=y CONFIG_PPS=y -CONFIG_PREEMPT_NONE_BUILD=y CONFIG_PRINTK_TIME=y CONFIG_PTP_1588_CLOCK=y CONFIG_PTP_1588_CLOCK_OPTIONAL=y diff --git a/target/linux/pistachio/config-6.12 b/target/linux/pistachio/config-6.12 index d608211a7f..4b7d740c5e 100644 --- a/target/linux/pistachio/config-6.12 +++ b/target/linux/pistachio/config-6.12 @@ -250,7 +250,6 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_PISTACHIO=y CONFIG_POWER_SUPPLY=y CONFIG_PPS=y -CONFIG_PREEMPT_NONE_BUILD=y CONFIG_PRINTK_TIME=y CONFIG_PROC_EVENTS=y CONFIG_PTP_1588_CLOCK=y diff --git a/target/linux/sifiveu/config-6.12 b/target/linux/sifiveu/config-6.12 index d8c8277c47..3959049c7c 100644 --- a/target/linux/sifiveu/config-6.12 +++ b/target/linux/sifiveu/config-6.12 @@ -319,8 +319,6 @@ CONFIG_POWER_RESET_RESTART=y CONFIG_POWER_RESET_SYSCON=y CONFIG_POWER_RESET_SYSCON_POWEROFF=y CONFIG_PPS=y -CONFIG_PREEMPT_NONE_BUILD=y -# CONFIG_PREEMPT_RT is not set CONFIG_PRINTK_TIME=y CONFIG_PTP_1588_CLOCK=y CONFIG_PTP_1588_CLOCK_OPTIONAL=y diff --git a/target/linux/x86/config-6.12 b/target/linux/x86/config-6.12 index 7a72dd2577..ebe2fa1d24 100644 --- a/target/linux/x86/config-6.12 +++ b/target/linux/x86/config-6.12 @@ -351,8 +351,6 @@ CONFIG_PHYSICAL_START=0x1000000 # CONFIG_PHY_INTEL_LGM_EMMC is not set CONFIG_POSIX_CPU_TIMERS_TASK_WORK=y CONFIG_POWER_SUPPLY=y -CONFIG_PREEMPT_NONE_BUILD=y -# CONFIG_PREEMPT_RT is not set # CONFIG_PROCESSOR_SELECT is not set CONFIG_PROC_PAGE_MONITOR=y CONFIG_PROC_PID_ARCH_STATUS=y